License testing
Merge branch 'WaterTest' into dev
Android changes