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

Change-Id: If95543302b63643d78b2460cf70851db47774e2b