Merge "Address comments from aosp/1298476"