Merge changes I2d09a84e,I111aab35 into pi-dev
am: 4cfd9f242c

Change-Id: I178fbaa3d299326674b0da1fb58dd36122719f2d