This patch revises more calls from client side to use SDK interface. Change-Id: I3ec4c3e7315f204d4eb6022bed63abd6b28e8157