Merge "Add requiredSystemPropertyValue support in idmap2"
am: b30f65713f

Change-Id: Id9636ed8579775ba9ca91bc3f44bc481a89697a8