Merge "DO NOT MERGE - Remove RetailDemoModeService" into oc-dr1-dev am: 484115b7 am: 379c317a -s ours am: 9fddcbae -s ours Change-Id: I6d960b20596d47b9ee603cdd79f99727b8f21a1e