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

Change-Id: I484f617b230ac50821f32cdf307dbb4d1edcd42a