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

Change-Id: I046330a3a29ba20cec535e13513b5d9eadc39d25