Merge "Persist configuration for the calling or current user" into nyc-mr1-dev