Merge "Re-introduce dummy autoRevok manifest attr as padding" into rvc-dev