Merge "Remove reference to com.android.retaildemo" into oc-dr1-dev am: 173e721ab6
am: 6de76e53b4

Change-Id: Ib814b3121958cf8429e1b65f3f7f669c145bdd35