Merge "Address leftover comments on aosp/894233"