Updating for fixes introduced in AGDROID-115