Attempt to fix bug 42321. And two fatals. Looks like this code did not work before and probably still has quite a few bugs :/

Change-Id: I7cdfe9563f52a66d9b7eb0243b85d0df58d16a47
Merge "Attempt to fix bug 42321. And two fatals. Looks like this code did not work before and probably still has quite a few bugs :/"