tree 2646f11c2893b1011d37706330051efed7285ccb
parent d70714b01950f0ddaebd23d9796bbd2f36295593
parent 6f4d166c321aec50c472b94844fc8553061c2bb0
author android-build-team Robot <android-build-team-robot@google.com> 1521761754 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1521761754 +0000

Merge cherrypicks of [3783728, 3783729] into oc-m4-release

Change-Id: I889f13a1cf509c6ed683d2b16880309a1ebbae02