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

Change-Id: I204feda99dd6e38928f72d164e9ad451626e6ad4