Timob 12504

CR first. No test cases yet, and may require updates as the Android version is done.