Merge "follow up aosp/2600007"