Merge changes from topic "idmap2-prerequisites" am: 62a5d4249f
am: 7672daf8e5

Change-Id: I2d35a2e73324961bc8c3d82ed1ce7d785335cee7