Merge "rmnetctl: Changes for guaranteed padding"