tree 2d327cc1d5e218a1cca521dde7774ac9849ca16c
parent ddceab77d2eefbc210a38c33210b42795781cb61
parent 047ff15d35291f4e22cb511b69abcd218c2746a0
author android-build-team Robot <android-build-team-robot@google.com> 1495663966 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1495663966 +0000

Merge cherrypicks of [2310196, 2310339, 2310340, 2310175, 2310320, 2310321, 2310322, 2310323, 2310217, 2310311, 2310349, 2310313, 2310331, 2310314, 2310286, 2310368, 2310383, 2310272, 2310439, 2310317, 2310318, 2310370, 2310352, 2310459, 2310287, 2310384, 2310237, 2310422, 2310440, 2310372, 2310289, 2310374, 2310355, 2310461, 2310423, 2310375, 2310376, 2310385, 2310386, 2310275, 2310462, 2310442, 2310443, 2310539, 2310378, 2310445, 2310238, 2310446, 2310540, 2310335, 2310582, 2310454, 2310659, 2310392, 2310393, 2310437, 2310679, 2310626] into nyc-mr2-release

Change-Id: I1457afef5fd1585a93c394ec0a3dcfce51d1c83e