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

Change-Id: I9d2c71a48d8cf981120d743db29c0902e03c1d1f