Merge "Fix typo in aosp/1242602"