tree a34a2015310f89aced7237b7720ff807013f03ce
parent 3cca4e7b068ea4f0fd69394b50f4993dfeca106c
parent 97744596339239ef8f6f58743945c7e0294d99f2
author Atanas Kirilov <akirilov@google.com> 1530142956 -0700
committer android-build-merger <android-build-merger@google.com> 1530142956 -0700

Merge "Backporting of b/77821568" into oc-dev
am: 9774459633

Change-Id: Ie0d176b94d15be65918b5f67bf9ed7f49f632def