Merge "Remove RetailDemoModeService" into oc-mr1-dev
am: 59d0441b0c

Change-Id: Ibfc275431add77f94e21c3543f1f97d8690c1414