Merge "Give mConsolidatedPolicy a default value" into rvc-dev