Merge "Add odm and oem policies" into qt-dev