Merge "Remove calls to APIs no longer being supported"
am: 30a4d24f03

Change-Id: Id827814e699d88908162767983f17bbbd7567639