Merge "Addressing API comments."