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

Change-Id: I307192d74bc8bba142af114f332bac42eb9a7d3c