Merge "Fix broken retaildemo tests" into oc-dev
am: cda99f106b

Change-Id: Ieec0cc5c41d9416da9f84e1d2a91ffe96e64afc5