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

Change-Id: Id72cd94c481bdc106ed022582399687b9abcc22b