Merge "Added SupportsCoexistence annotations to updated Api's"