tree b14ad4eea0bf95020a93ed2911f223bd7907cdc5
parent 9504cd35ec19878c1d72d5c8353f4fa761f0d846
parent 1b67b798cf89605ec417063d368198db25cc659d
author Atanas Kirilov <akirilov@google.com> 1530144593 -0700
committer android-build-merger <android-build-merger@google.com> 1530144593 -0700

[automerger skipped] Merge "Backporting of b/77821568" into oc-dev am: 9774459633 am: f3f6e2f9ee
am: 1b67b798cf  -s ours

Change-Id: I1f209b583519e73c0912db7583b34324003a5526