Merge "DO NOT MERGE - Remove RetailDemoModeServiceInternal" into oc-dr1-dev am: 4ac942f140  -s ours am: 5c74928b71
am: 2a8bd80211  -s ours

Change-Id: I137959c5866e7e6c30137f23f56d09e97c15ea05