tree cf65982b8dfa909be5ea47e825ad66131d5b8d2e
parent aeda17b5ff55585306e893ea9c580dc61b802039
parent 72cd352867f70d5b49e7d5afb3ae1a7520e3a8a0
author android-build-team Robot <android-build-team-robot@google.com> 1519689193 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1519689193 +0000

Merge cherrypicks of [3661626, 3661980, 3662429, 3661545, 3661546, 3661579, 3661580, 3662430, 3661547, 3661548, 3661549, 3661550, 3662578, 3662579, 3662580, 3662581, 3662582, 3662583, 3661597, 3661598, 3661551, 3661552, 3661553, 3661554, 3661555, 3662596, 3662597, 3662598, 3662599, 3662584, 3662585, 3662586, 3662616, 3662617, 3662618] into oc-m4-release

Change-Id: Ica7cfbd0adc314077bf1eb2d6c405cc0857a3f7e