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

Change-Id: I2eca874cf523b2f71073612a786c5954aada3873