tree 8e7152298c08a438a3650faea3822f32c57de3f7
parent b0e83312cae3b183394148056196f6ad468a6a98
parent 973fb331edd1bd20e3a8115e8a335b87dab4d837
author android-build-team Robot <android-build-team-robot@google.com> 1497638994 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1497638994 +0000

Merge cherrypicks of [2420306, 2420248, 2420158, 2420321, 2420159, 2420160, 2420266, 2420284, 2420308, 2420342, 2420177, 2420195, 2420344, 2420345, 2420179, 2420324, 2420251, 2420269, 2420271, 2420325, 2420310, 2420220, 2420348, 2420291, 2420328, 2420330, 2420383, 2420331, 2420255, 2420296, 2420278, 2420229, 2420335] into nyc-mr1-volantis-release

Change-Id: I55bb80025abcfe1d0366269f7278bc6d8b71672b