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

Change-Id: Ia33f7dda4e861df6b4e211ff09e0539acdf40829