tree ab8f74a2925297d88a7622d32a9986df5d8fecc4
parent 3265b20fa9cf9712a83ccbcbb3f6b5cf4345f73d
author The Android Automerger <android-build@android.com> 1432845759 -0700
committer The Android Automerger <android-build@android.com> 1432845759 -0700

Cherry pick for CL 698892.