tree c2a45793c59445b5e9c030061cadd1c80e404dcc
parent 294616ab115fbcfc5ad0e516978a1ab0166c33f2
parent dfb3d1e25d309cf3ded0abf52b21ee597c0e9d61
author android-build-team Robot <android-build-team-robot@google.com> 1506557473 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1506557473 +0000

Merge cherrypicks of [2969924, 2969794, 2969773, 2970233, 2969774, 2969730, 2969731, 2969795, 2969796, 2969797, 2969798, 2969799, 2970191, 2970192, 2970193, 2970194, 2970195, 2970196, 2970197, 2969421, 2969422, 2969423, 2969496, 2969900, 2969564] into nyc-bugfix-release

Change-Id: I0c6b752bf9a53f3e82440b5cf77bca5b8180630d