Merge branch 'android-byod'