Merge "Bug 563298 - removed deprecated method"