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

Change-Id: Iaf70839958e257d195cb0538b1951771a0c7790b