Merge "Additional tidy up after Features." into arc-apps
am: 74c59c4aa8

Change-Id: Ib12d22265d7e054b3526cc941c000ae70c67f56f