Merge "Update sharedPreference to false when exits new device provisioning" am: 1136af9966
am: d25ea190d9

Change-Id: I055efd867cbe2e9034774af082178476c47fe83a