Merge "Fix addRoute replace default route unexpectedly" into rvc-dev am: 887941cb am: 51bfa205 am: 346501f7 Change-Id: I925f206c26b1898798bddd9f8b59e2b987e48538