Merge "Address review comments from change 000e1885701c8f."