Merge "Address comments on aosp/1781202"