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

Change-Id: I2cbf1ae4352f531359a82d8d2ee811b760d090c7