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