[automerger skipped] Merge "Fix review comments on aosp/1213524" am: a77fbc2539 -s ours am: 70158f3240 -s ours am: 45d4d19fc5 -s ours
am skip reason: Change-Id I621cfbe165996c67b201ca2dd2f95a5ab9af10ee with SHA-1 d969656f45 is in history

Change-Id: I0fe69f7c3e729f4317b7bbead5d4dc575fa83ba6