Merge "Android 1<3." into tm-dev