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

Change-Id: I14c1e9d96b261f3afc1da31ebfe5e03b5ff9e8a1