Merge "Address API review feedback"