Back my change out. DONTBUILD
Test Android config changes