Merge "Add requiredSystemPropertyValue support in idmap2" am: b30f65713f
am: fa9362aec9

Change-Id: I4a1c2a34d4ff4982b4cad676cd56be19c8a37c00