This is a cherrypick of aosp/1804116. Bug: 197217250 Change-Id: I04bee764bf50734523ff2210d30ed052dcb036bd Merged-In: I04bee764bf50734523ff2210d30ed052dcb036bd Test: No code changes done.
This is a cherrypick of aosp/1804116. Bug: 197217250 Change-Id: I04bee764bf50734523ff2210d30ed052dcb036bd Merged-In: I04bee764bf50734523ff2210d30ed052dcb036bd Test: No code changes done.