Merge tag 'upstream/18.11-rc3' into 18.11.x 27/15927/1
authorLuca Boccassi <[email protected]>
Wed, 14 Nov 2018 11:13:57 +0000 (11:13 +0000)
committerLuca Boccassi <[email protected]>
Wed, 14 Nov 2018 11:14:10 +0000 (11:14 +0000)
Upstream version 18.11-rc3

Change-Id: I60edf371bef2e72307adde288af0ba1e9de3a720
Signed-off-by: Luca Boccassi <[email protected]>

Trivial merge