[automerger skipped] Merge changes from topic "from-pi-gsi-3"
am: ba8322d06a  -s ours

Change-Id: Ie49418c22676bc1c4f13a7bf4bbde1a35606eb1a