Merge "Address comment from aosp/1232197"