Implement some changes based on parent branch PR review#1

kevinquinnyo wants to merge 3 commits intodpi:universal-clockdpi/oauth2-client:universal-clockfrom

kevinquinnyo:uc2kevinquinnyo/oauth2-client:uc2Copy head branch name to clipboard