Merge changes Id0f21876,I8e27d2d3,I6989f11d,Ie2394b9c,Iba75a955 into pi-dev
am: 13487078b4

Change-Id: I17caa213ed5144697afcfe4fec6b734083c18d53