Android app related changes