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

Change-Id: I45ac33de68408b9bc87bc1d6bc462020fb34a501