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

Change-Id: I4108800878d8a276d33e3ab20fdd06572bb6a695