Merge changes Ia9df12fa,Ib114e8cb into pi-dev am: d8bfc71c6c
am: 653c02e438

Change-Id: I0ac0cd0c1be05381854b795532770a99fe5d2b2c