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

Change-Id: Ic112a22fc8b9797420de51bb45f39499a9697f4d