Merge "Merge "Native crash -> ISE" into udc-dev am: f0bc25e44d am: 848d9c3ba2"