Merge "Fix crash on Media Center after Chassis integration" into pi-car-dev am: 4e70c34549 am: fa4d353851 am: 0be71f2d06 am: ff0918f671
am: a0f09e8e3d

Change-Id: Ief008c4bd2481ecb2a93660f5cc4e37b82f837a4