Merge cherrypicks of [4036940, 4036941, 4036942, 4037115, 4037135] into pi-release

Change-Id: I78d051f65b582f6ca8e5a9eb565a1c2d7d4a6705