Merge "Merge "Use package from sipper if default is null" into oc-dr1-dev am: ca24d0435b
am: c65e873d3e
-s ours" into oc-mr1-dev-plus-aosp
am: e140bc3795
-s ours
Change-Id: I5439c17182dce2f149033e749161d00345a5dd12
This commit is contained in: