Merge "Update error UI" into pi-car-dev
am: 6e8a6bdfb2

Change-Id: Ic48e9adb713c640384ed8d996a88edb6083fb63c