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

Change-Id: I1e021c6dd1d9626a2d7fb770ab0909d50abb41d9