Merge tag 'upstream/17.11.1' into 17.11.x 07/11007/1
authorLuca Boccassi <luca.boccassi@gmail.com>
Wed, 7 Mar 2018 11:25:34 +0000 (11:25 +0000)
committerLuca Boccassi <luca.boccassi@gmail.com>
Wed, 7 Mar 2018 11:25:37 +0000 (11:25 +0000)
Upstream version 17.11.1

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

Trivial merge