Merge "Remove using package name" into oc-mr1-dev
am: 941fab312c

Change-Id: I35530f9a9c0044d6842b9698f758b2f1cf468f1b