Merge "Add parceling for DhcpServingParams" am: f6209cf0dd
am: 133f281d12

Change-Id: Icab36165187d204de5fdbc4f4271e758ebaebed8