Merge cherrypicks of [4285741, 4285547, 4284105, 4284670, 4284671, 4284672] into pi-release

Change-Id: Ibaf900fc40826f6c6d386c9dee2f0cc302bd1abb