Merge "Set the type of system routes" into rvc-dev am: 71c824f9 am: 60c53ca0 am: dbbb3210 am: 4ec87586 Change-Id: If58fb616829cfe11f7359d2bca71fc08cf52184b