Merge "Add default namespaces of odm properties"
am: 74828e65d5

Change-Id: I1ba1400dbdfb7eebd0a40571cc65dec45f081d57