Merge "All apps have 'null' feature" into rvc-dev am: b7050a36af

Change-Id: I447944825d15efb2ddb4a98dd515b172952f51dd