tree f7665dd7b34aa5368957a3874d165272f2075ff3
parent 13179a8e75fee98740b5ce728752aa7294b3e32d
parent 3613ed6742e228b76d8aeb01171b46d2d1082399
author android-build-team Robot <android-build-team-robot@google.com> 1496262688 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1496262688 +0000

Merge cherrypicks of [2338295, 2338197, 2338407, 2338385, 2338425, 2338465, 2338447, 2338426, 2338386, 2338387, 2338466, 2338368, 2338296, 2338198, 2338450, 2338470, 2338429, 2338390, 2338430, 2338315, 2338452, 2338453, 2338431, 2338297, 2338354, 2338200, 2338391, 2338392, 2338482, 2338357, 2338411, 2338394, 2338318, 2338370, 2338434, 2338472, 2338473, 2338395, 2338299, 2338412, 2338413, 2338454, 2338396, 2338474, 2338397, 2338360, 2338455] into nyc-mr2-security-b-release

Change-Id: Ie989c9e8d977c1e4e668cbc07b7839171f2dc9b9