Merge "[Settings] Add more owner" into rvc-dev am: 6e50dfc6ec am: f702bb94d0 am: 907c0740d5 am: 7e107cac02 am: 689aab245a
Change-Id: Iba9049ce88ef9049ed433e9741714b038294770a
This commit is contained in: