Merge "Remove fields from list of promoted fields" into rvc-dev am: a5c7fcdca5 am: f7ed9c158a am: 16317b89cd

Change-Id: Ifc35e7179f8eb6ae6c26593bf940ff3d8e16a5ff