Merge branch 'chadv/anv-android'