Merge changes Id8595dcb,I50c4227d,Ic7b31bbd,I26ef3b1a,I4c9727ad into pi-dev
am: 9711b52606

Change-Id: I09f4179fad30abae457c96557e00af8a4632c61a