Android official branch hydro-devel->hydro
Merge pull request #2192 from stonier/patch-45

Android official branch hydro-devel->hydro