Merge changes Ie263ab57,Ice16de3b into pi-dev
am: a5691fa5c6

Change-Id: I5d9a343249f54c565a0e1e74ec3cb2d3a948668f