Merge "Merge "Hide non transferable routes" into sc-dev am: 88146b48 am: 6ae49b4d" into sc-v2-dev-plus-aosp