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

Change-Id: I042eaa94407e1aa431f60afcb39b27198acfa3f0