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

Change-Id: Ief1e732e3b18738c5c0f62f2fe8c47f66169c85b