Merge branch release-2016 into release-2018
authorMark Abraham <mark.j.abraham@gmail.com>
Tue, 20 Mar 2018 22:17:51 +0000 (23:17 +0100)
committerMark Abraham <mark.j.abraham@gmail.com>
Tue, 20 Mar 2018 22:17:51 +0000 (23:17 +0100)
commit79a3c31ffbb70baed09021b9bc71d0494406a306
treed41aa211c6bf1fc732b83a7ab493709429f9351b
parent1333a483d730aed0633c63c782374c3ad6bb10c9
parent64f14c66ded771fab364aff361ebe6be65571342
Merge branch release-2016 into release-2018

Conflict in pre-submit matrix, kept 2018 content that already
has the same logical change made.

Change-Id: I40b2db8d149388bed07471fcdb8082b0fc92b9b5