tree b1f8488683b9d09f5b141d74e1b4a59092e4c811
parent e9a6533f6bfdb24130dcd7437ea62aa75e4291d8
parent 30006d8510eb51539c4621fcae044febd08f674a
author android-build-team Robot <android-build-team-robot@google.com> 1500050054 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1500050054 +0000

Merge cherrypicks of [2540686, 2540687, 2540384, 2540688, 2540689, 2540690, 2540385, 2540691, 2540386, 2540387, 2540732, 2540388, 2540389, 2540733, 2540390, 2540752, 2540753, 2540736, 2540737, 2540757, 2540738, 2540758, 2540739, 2540759, 2540740, 2540741, 2540742, 2540743, 2540744, 2540745] into mnc-mr2-release

Change-Id: Ib2251c0cdf1456538de975e9298d8ba237e375ac