minor tweaks to align with upcoming SDK changes from feature/mo_android