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

Change-Id: I5ef14b6a880b4fbcde7598ed5506d6a6ce04ec85