Merge "DO NOT MERGE: Camera: override external facing for API1 client"