Merge "Update error UI" into pi-car-dev am: 6e8a6bdfb2 am: fc218e2af0 am: e02488db83
am: 11164b5bfa

Change-Id: Ic187aacd6c1641af42a8304381219a9145736fc4