Merge "Address remaining comments on aosp/1607893"