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

Change-Id: Ib56e76db3a2a426a142492a5970da0e21816c1cc