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

Change-Id: I52f2e5d6ae280299bc31230f00acd4814b79c1e8