Android 1.6 release 1.5
DO NOT MERGE Remove test code

Bug # 2092944
3 files changed