tree f031ff9c0a2a1f0daf721fc2f9862dc14739326f
parent be327c9fc9de911196aad40ef690154f4feb68d1
parent 858895a3649cbbaa98ad179d0f4163daaf4352d8
author android-build-team Robot <android-build-team-robot@google.com> 1519420557 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1519420557 +0000

Merge cherrypicks of [3654171] into oc-m5-release

Change-Id: I175b50cba5eb73028ec205f4ca9abacef63fcd80