Merge "Remove reference to com.android.retaildemo" into oc-dr1-dev