Merge "Removed usage of hidden APIs" am: 8a1aa42d70 am: 108e59256e
am: c0dba50ca2

Change-Id: I8406c0dc607a35bdde2c4315d4b94a3e7d558ec3