[automerger skipped] Merge "Modify SettingsLib for partial connectivity" am: 64bb980f45 am: 1eb23ba267
am: 04bd7a8bad -s ours
am skip reason: change_id I4791abe9351c62d9549ada383aa4cc8aa34ddaf2 with SHA1 fc731abf72 is in history

Change-Id: I2829c7d9c54f2e3ce0e067a39d446fb7b73667ca