Accomodate change in API behavior

Change-Id: Ia994582370cbfe16548fb431a1dbf0d601692028
Merge "Accomodate change in API behavior" into R1.06