[1.6.0] Merge Android changes from @twaddington