Merge changes Icf7cf2fd,I325521b7,Ia80c865d,I73599f62,I8526e671, ... into pi-dev
am: 2afd5172c3

Change-Id: I4d56fc52477393cef4267849218dc9e552d72681