Merge "Remove calls to APIs no longer being supported" am: 30a4d24f03 am: 93df3c5ad6 am: 72ad627539

Change-Id: I2e9452f98d9bffd3647329b3b030692aeaa56a33