Merge "Fix review comments on aosp/1213524"