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

Change-Id: I9451656888c659d58ac7315f552e7ecaa07d8615