[automerger skipped] Merge "Fix review comments on aosp/1213524" am: 100e0b9a51 -s ours
am skip reason: Change-Id I621cfbe165996c67b201ca2dd2f95a5ab9af10ee with SHA-1 ab2fed7241 is in history
Change-Id: I1016fc76028aeafa9f15841b4e2951957aa11578
This commit is contained in: