Merge changes from topic "hiddenapi-cherrypick"
am: b54f2acc72

Change-Id: I378f50fd4f6290518fd9a39d4c4eb1e972e3d60e