Merge "Adding RetailModeService to handle retail mode" into nyc-mr1-dev
am: a09c9e0fc4

* commit 'a09c9e0fc48816096349aac8960a3b49101d90a3':
  Adding RetailModeService to handle retail mode

Change-Id: I8ac04712c319eeb4ff8087ea828331bdb0450867