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

Change-Id: Ib1849c5f7d7bf5fcdf403cec73db3848ac12f2cb