Merge "Renamed attribute with abbreviated name" into oc-dr1-dev
am: df83b8cfcf

Change-Id: Id2b3ebf54192171f81028da83469a9efdc2840ea