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

Change-Id: Id0fe8d3025e47c9e798ee082d7c22dd18c308254