Merge "idmap: suppress print for padded resources" am: 3949701c6f am: 4f4218a3be
am: aed3472304

Change-Id: Ie98121efacb6327e173b9de55aabe80120948864