Merge "Modify SettingsLib for partial connectivity" am: 64bb980f45
am: 1eb23ba267

Change-Id: I8b6c1ef312c0b79f41ebbfe17eaccfa535ac0597