Merge changes Ife3ef43f,I50ec5d8b into pi-dev
am: af0c783042

Change-Id: I7f19290beba17dbe6d2e1f4350d7cd1ca98e6217