Merge changes Ib8f43601,I61d82dca into pi-dev
am: 59a1bef8e9

Change-Id: I2a6f3387a8b271f5805ea6a794eeb27e190aa1c5