Merge "Removal of usage of hidden APIs" am: 78b20d0d58 am: e8eefec918
am: c162389c31

Change-Id: Icdf8eebe0b8b5a59b96d405b76a6561277ba655f