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

* commit '6291e0ba4f5cbee39ad70cdbd27117bdad531797':
  Add namespace before attr name in defPropMap

Change-Id: Ib1c40ddd52c42da023abff277379e908509778f0