am 10572edb: Merge "Routing workaround." into jb-mr2-dev am: 44bdc908ca

Original change: undetermined

Change-Id: I7912b19f844b5c8da8df8b534a250f8c19736e76