Merge "Add missing sniro simulator properties"