Merge "Add persistentFeature application attribute." into oc-dev
am: e4960cf495

Change-Id: Idf9355d092efa1ffb7eacd9299e3a8471396d3d6