tree d1aa752c8e4ec1e5eb35945a82e5ccc64728b00d
parent e23f4b43d99dc40bb10975cac8cd26fdd33661db
parent ea8fde2bced4104b635089542fbcabbcd63c9b76
author android-build-team Robot <android-build-team-robot@google.com> 1501616827 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1501616827 +0000

Merge cherrypicks of [2640856, 2640242, 2640243, 2640244] into oc-mr1-release

Change-Id: I5fda2b8e93fab2525bb88827fcc1a25509c57616