Merge "Use package from sipper if default is null" into oc-dr1-dev
am: ca24d0435b
-s ours
Change-Id: I438dc044a0f923a288d2dea795c85ae48147bd8e
This commit is contained in:
am: ca24d0435b
-s ours
Change-Id: I438dc044a0f923a288d2dea795c85ae48147bd8e