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

Change-Id: I4bbbf0997f5bf9a1ebba1eb9968471fff9f297fe