Merge "Update documentation for settings, affiliation API" into rvc-dev am: 153de40327

Change-Id: Ic3a7e6635a01436a3bdf3863e328af3ac9040341