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

Change-Id: I65bf196ea9add33b4b12b93427501eead636bdc4