tree be5f370b5ef5ac8021ad931c83a19bcafbdad896
parent 0a38f1a3aabbb9343720463dd271b23e8a2edafc
parent dfc5222f4ba592cfe708f754e91bdef0976ad0a0
author android-build-team Robot <android-build-team-robot@google.com> 1506619006 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1506619006 +0000

Merge cherrypicks of [2973982, 2974657, 2974658, 2973983, 2973984, 2974689, 2974690, 2974691, 2974692, 2974710, 2974711, 2974713, 2974714, 2974215, 2974216, 2974217, 2974218, 2974219, 2974220, 2974729, 2974730, 2974731, 2974732, 2974733, 2974734, 2974735, 2974736, 2974737, 2974738, 2974739, 2974740, 2974741, 2974742, 2974749, 2974750, 2974751, 2974752, 2974753, 2974647, 2974744, 2974693, 2974694, 2974648, 2974513, 2974665, 2974746] into nyc-mr2-release

Change-Id: I9b92ad57bcccb162e9d4e5235068003a041452d4