Merge "Address API feedback."