Merge tag 'upstream/17.11.2' into 17.11.x 52/12052/1
authorLuca Boccassi <luca.boccassi@gmail.com>
Mon, 23 Apr 2018 13:40:11 +0000 (14:40 +0100)
committerLuca Boccassi <luca.boccassi@gmail.com>
Mon, 23 Apr 2018 13:40:14 +0000 (14:40 +0100)
Upstream version 17.11.2

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

Trivial merge