Merge changes I6618561d,If9479cd9,I3e13894e into pi-dev
am: 858e30b7d7

Change-Id: Iff0abb515b1d2f158a017dc91dfc10abd1da7905