Merge "Transitionless crashes" into pi-dev am: f921b507ea
am: b2920eb245

Change-Id: I48f7062de61b31726aa2ea5f82a040645b4140f1