Merge "Address comment from aosp/1948169"