[automerger skipped] Merge changes I8f34f9ed,I7e607d87 into pi-dev
am: 76612b1fdb  -s ours

Change-Id: Iec942c1863b4908a9fddc7bfa4885c11ba8cd699