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

Change-Id: I72a5e4cc03666bf7640b43ddd76bcb4620c93ed9