tree 9a45139c4f491f0495f15d728568133becf2dbb7
parent adf8f8bc608912f588467f92b8d098ebf5397b4b
parent 24aaf4d7ad0b2920ee9a435d375182680ee90284
author Phil Weaver <pweaver@google.com> 1499899300 +0000
committer android-build-merger <android-build-merger@google.com> 1499899300 +0000

DO NOT MERGE Back-port ag/2491664 am: 9a14484b38 am: 840b78e19e am: bebc9f9f3c  -s ours am: 98e0930394  -s ours am: df045253a4 am: b72ffa47a4  -s ours am: bb12830bf9 am: 4a40ef7688 am: a486c82d9c
am: 24aaf4d7ad  -s ours

Change-Id: Ibf0c76ba5e9059cd87282cefa9b0c7724ed64128