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

Change-Id: Iba0646b31a09b08d22c0dd9ff83dd9ee57fdc821