Comment by fph

Two fixes that would be trivial to backport to mainline Android.