Update config information for OS_USERNAME

Change-Id: I158cae1476a825ddcf1e45ec039044ec30b28d0c
Merge "Update config information for OS_USERNAME"