Merge "More power savings: No need to keep a history of outgoing packets" into jb-mr1-dev