Merge "Applied new package name" into oc-dr1-dev
am: 2f78c51875

Change-Id: I0feca552e021a3debb8d3c7222dabdc312f449d2