Merge "HIDD: Address API Review concerns"