Merge tag 'upstream/16.11.8' into 16.11.x 57/14557/1
authorLuca Boccassi <luca.boccassi@gmail.com>
Wed, 29 Aug 2018 18:00:48 +0000 (19:00 +0100)
committerLuca Boccassi <luca.boccassi@gmail.com>
Wed, 29 Aug 2018 18:00:53 +0000 (19:00 +0100)
Upstream version 16.11.8

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

Trivial merge