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