Merge changes I41328afc,Ie543519f into pi-dev am: 63abd8fdbc
am: 67bfbf1833

Change-Id: Ibeac7204fd35db5da02e3ad307d249a1aa31f6da