Merge "Address comments on aosp/1612040."