Merge "Add namespace before attr name in defPropMap" into nyc-dev
am: 4c5e7a740a

* commit '4c5e7a740a632829b48b2324f80a43ab94ac7551':
  Add namespace before attr name in defPropMap

Change-Id: I93619d0e2a28ef30b43e1fe8361142da3122cdda