Merge "Fix read/write permission error in ProvisioningManager" am: 17e0d712bd
am: b6cf33fbd9

Change-Id: I64e97f9ee77af5e0198aa518b5014aeecc8145ff