Testing new branch
Android side framework
Merge branch 'test'

merging the android framework