Merge "IpManager: fix test for default ProvisioningConfiguration" am: 2627d4856b am: 361162b636 am: fe88fa947e
am: 93c5a4b389

Change-Id: I7c66b30f5f7961900c3b5a5baf0c14644cbcb69e