Merge "Fix Chassis RRO generation" into pi-car-dev am: 00d0eb42d9
am: c7952345f7

Change-Id: I773a937473245b1966dd5ac35db28f4f130d109d