Merge changes I6358cfe3,I00b20bd7 into pi-dev am: ef85bbfe4d
am: 32845a5e36

Change-Id: I8581b2f954595d48c74db36604e6c905b10a73ee