android-7 => android-5
protected code + TODO comment
Merge branch 'master' into beta