Merge "Change strings from Instant app account to setting" into oc-mr1-dev