[automerger skipped] Merge "Address the comment of aosp/1288493" into rvc-dev...
[automerger skipped] Merge "Address the comment of aosp/1288493" into rvc-dev am: 7c23183b -s ours am: 23f5f90e -s ours am: de3ac243 -s ours
am skip reason: Change-Id I0cf337625cee31a47879c59e9b18657ea7624eb4 with SHA-1 8a37bc94 is in history
Change-Id: Idbc32aeefbfff59383552c92c7409c73ba874e66