Merge changes Idb4d304e,I65a7387a into pi-dev am: e16d4a8da1
am: e1a474f114

Change-Id: I872a94b04e149077425c97b2226ac68d630e4077