Merge "Merge "Remove reference to com.android.retaildemo" into oc-dr1-dev am: 173e721ab6 am: 867df9f1b9" into oc-mr1-dev-plus-aosp
am: 60bddcf2f0

Change-Id: I6df4f66ec867cd8e294d3b1d4003a9846e11bf4a