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

Change-Id: I2f101ddd172eb36148540821693802c7b0889e37