Android stage 1
Merge branch 'refs/heads/master' into Stage1
Merge branch 'refs/heads/Stage1'