android fix 1
Merge branch '1.x' into 2.x