Merge "Addressing API review comments."