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

Change-Id: I6e42d26ae430c213f65e466a2c556760ff0e14eb