Merge "Removal of usage of hidden APIs" am: f6ab107105
am: 604694740f

Change-Id: Ib0999dd447ea33fa743d6632e2c1e5cc8b361831