Merge changes from topic "hiddenapi-cherrypick"
am: 4972754f23

Change-Id: Ie04a1c7ec3ae54baa2c3ca735c6901a5a8e0b485