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