Merge "hiddenapi: Fix map insertion bug" am: 5991b184a4
am: b1da905730

Change-Id: Id10b2e4c0aec1b093148fb93a08843695fe54a48