Merge "Follow-up CL to the change at aosp/1523097."