OC-2746: Changes from comments in PR#1 in android-library repo