Merge "change string setting to read to ANDROID_ID" into jb-mr1-dev