Merge changes I72688f65,I2dd8d439 into pi-dev am: ae0b962865
am: 6568eec338

Change-Id: Ia21cb148114f3ddd83b015dc87d7c6ab0ab2fc53