This is a native Android module written by Justin Toth that fixes TIMOB-3887.  All credit goes to Justin; I only built the module.