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

Change-Id: I9937a58fffdbeefd9a6aace84dd977c2fe22aa09