Merge cherrypicks of [4902694, 4902725, 4902587, 4902588, 4902761, 4902762] into pi-release-2 Change-Id: I87521f85b3b245dc82bdad4f1181d3ed7dbb9734