Merge changes I7c48a326,I7395ecd4 into pi-dev am: 4e4b6ff508
am: b06836197b

Change-Id: I5c9494641ddad266f211789dd50af240b4831858