Updating for fixes introduced in AGDROID-115
Merge branch 'AGDROID-115'