Merge "Update AmbientContextManager with suggestions."