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

Change-Id: I0f041a81c19a569b3635d435c89a08d19d2e0935