[automerger skipped] Merge changes I8e27f8b9,I78d2dc79 into pi-dev
am: 7cb8aade20  -s ours

Change-Id: I7d5028052cdb8982967c973f8668a2394ab72311