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

Change-Id: Ie98918aa2410d629f8283c747d8113f42a640719