tree 73641e04ccdd42ade1516136278d117b23d04bab
parent 2f757c8f92115f35dd220f836706805313df349b
parent 666ca6e20e7725dabf967abdea4bb610ab0c72ee
author android-build-team Robot <android-build-team-robot@google.com> 1500324573 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1500324573 +0000

Merge cherrypicks of [2550323, 2550336] into oc-release

Change-Id: I798c16a354a33f39c5f98ef4637d9bc1072bda77