Merge tag 'upstream/18.02' into 18.02.x 90/10690/1
authorLuca Boccassi <luca.boccassi@gmail.com>
Mon, 19 Feb 2018 11:18:57 +0000 (11:18 +0000)
committerLuca Boccassi <luca.boccassi@gmail.com>
Mon, 19 Feb 2018 11:19:06 +0000 (11:19 +0000)
Upstream version 18.02

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

Trivial merge