Changes for the android app will be cherry-picked from the develop branch and applied on qa-triple which is LTS 1.2.0 version