Merge "IpManager: use InitialConfiguration for provisioning" am: 5b218bdc8e am: c6a9b5564a
am: e869136a54

Change-Id: I8e9c6de63697b8c3f41480d69309360763119838