tree 9a5c9a7ea009e1d06d060587e69056bc03af8a01
parent c067bd3266a26e26d4f4c0c3cc8c3b47d733499f
parent f4ff35f6da7660852d9b67f32d42a85fa7706489
author android-build-team Robot <android-build-team-robot@google.com> 1503516005 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1503516005 +0000

Merge cherrypicks of [2780997, 2781272, 2781273, 2780106, 2780107, 2779714, 2779715, 2779716, 2779717, 2779979, 2781313, 2781314, 2781315, 2781316, 2781317, 2781318, 2779718, 2779719, 2781352, 2781353, 2779980, 2781610] into oc-r5-release

Change-Id: If86e2fc505eb907253e96d288fd2b5b5d957f6d0