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

Change-Id: I0b9ee1a61d98f882f2cfda21cea4c30220cdd427