Merge "Fix idmap scan to apply odm and oem policies" into qt-dev