Merge changes I0cd83a93,I03ae2bbb into pi-dev am: 411e79b8b0
am: a4eec2cefa

Change-Id: Ia8f985b448251f911484e6bd63fa562bffc1b0e4