Merge changes I4c3a967c,I3fd5732f into pi-dev am: 17368c3f62
am: f5e248b15e

Change-Id: I683af920020f5e3642bdf218d40b637c842d16f9