Merge "Address leftover comments on aosp/1212191"