Merge changes from topic "invalidate_idmap" into rvc-dev am: 6cb79cdfb7

Change-Id: Iec3d0e3bab28964442c5aada00c2586e284feb92