Merge "Remove fields from list of promoted fields" into rvc-dev am: a5c7fcdca5 am: c60b9337f8

Change-Id: Iec9ada8b21e1a80badaac85610564b7c0cf199b8