Merge "Include splits in dumpsys package output." into lmp-mr1-dev