Merge tag 'upstream/18.11' into 18.11.x 11/16211/1
authorLuca Boccassi <luca.boccassi@gmail.com>
Tue, 27 Nov 2018 10:46:23 +0000 (10:46 +0000)
committerLuca Boccassi <luca.boccassi@gmail.com>
Tue, 27 Nov 2018 10:46:29 +0000 (10:46 +0000)
Upstream version 18.11

Change-Id: Id9cada796755fc46d8b3f4af056b0e80879c94f6
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>

Trivial merge