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

Change-Id: I12370678db9c9ec7565cbd658ac2a0b5e9a530b3