Merge "Add requiredSystemPropertyValue support in idmap2" am: b30f6571 am: fa9362ae am: b8a749da am: 042900cf Change-Id: I8b7f30cc8088b4d04856358e7f1ffc18159b1b7f