tree 684cb27d49f84bf1915dfbfa43d4659b5bdc34a2
parent 05902faa8b86507611e13d16e71b76f29c057148
parent 1028b26d46016ed2695782dd76df67c751a64576
author Atanas Kirilov <akirilov@google.com> 1530148246 -0700
committer android-build-merger <android-build-merger@google.com> 1530148246 -0700

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

Change-Id: I78396616a3fa15cdf91bcee465bc4027be201898