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

Change-Id: Ibab6c7a25fe9534bd1a274065b36dc7813f745e0