Merge "Address aosp/1199568 leftover comments" am: 0d839ffd2a

Change-Id: Ia29470f5060e2c0bf32882d57ca20f45d681c08a