Merge "IpManager: use InitialConfiguration for provisioning" into oc-mr1-dev
am: dd09e994f5  -s ours

Change-Id: Iecba2429d46ac7eec020ab8301d687fc1f79cde2