Android Base API merge to master