tree ed028988fc328302897f66e6593d900b2733a576
parent aea37a492d5e2853cb3dde6325f76b0a4f8bcccf
parent 80fa790913acd71043e3e26be10484a89bf3b3ce
author Mark Chien <markchien@google.com> 1588938916 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1588938916 +0000

Merge "Address the comment of aosp/1288493" am: 974d6f5978 am: b51ef98b86 am: 250a10eec4 am: 4fa682fe4e am: 80fa790913

Change-Id: I3cb7b968362ebc7d629a617165683dcc17add228