Merge changes Ie828d9b4,I5ddd6323 into pi-dev
am: de1de87904

Change-Id: I34830ca4a6568290efe3c43840c50ed7bed437c7