tree 9827260541fdbcb505d58be8b86fc02739056a69
parent 457ffc5b2406e5bb6dd568d78a8f08afdf0d9cb3
parent f233677ac00fb05795f34811a4c2c7b9798d5e35
author android-build-team Robot <android-build-team-robot@google.com> 1497638980 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1497638980 +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: Id96a57cd611bbf4b646783c10c130830f82212a9