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

Change-Id: I8e4b6280fcfc2623f982f9ea3bb3f0349d05482c