Changes to support Android Tablet

(Excluding Files API)