Merge "Fix dumpsys package."