tree e33a1c07d924ea2e68c385a7b3a07ce84a9676cd
parent dc0c7a58198055f8f6ff523729af6b49a6a5efae
parent bf8b140b7922f0f922ab4a03a2381652af066a55
author android-build-team Robot <android-build-team-robot@google.com> 1500050050 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1500050050 +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: I28eface222776a59980f56dac5d14e45ec05ad96