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

Change-Id: I5f2d47c217152d47743b72e6082abf625d2425f8