TENDERLOIN:  fix up issues with playstore

Change-Id: I06f3b85cee907126da133b6e950e483c59b6638c