tree 49e1204c324a715c89a1346dc9829571432b2b0f
parent b433c26ac04405700d2c015c52ba40675fca6b19
parent e62165309d4d1d118adb1ec863353c658ec89079
author android-build-team Robot <android-build-team-robot@google.com> 1505340424 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1505340424 +0000

Merge cherrypicks of [2891339, 2891340, 2891341, 2891342, 2891354, 2891355, 2891356, 2891357, 2891343, 2892569, 2891358, 2891359, 2891361, 2891362, 2891363, 2891364, 2891365, 2891366, 2891367, 2891368, 2892589, 2892590, 2892591, 2892592, 2892473, 2891272, 2891197, 2892597, 2890868, 2892600, 2892629, 2891198, 2891199, 2891200, 2891201, 2891202, 2891203, 2891204] into mnc-mr2-release

Change-Id: I515dd9815dcbe1a42341c2bc9a1dc5eb0871fd01