Merge "Rename persistentFeature to persistentWhenFeatureAvailable." into oc-dev am: 35312fd4c6
am: 23a0f58eea

Change-Id: I2b7aada5d0ec51c2a5513b15f6f855fd7cf5166c