Play Store changes

Change-Id: I2923bcbbcf9d10d5ab90351489d399ab848e12b7