Merge "Update the default owner" into rvc-dev am: 1900c74078

Change-Id: I4e296984e71c3d65c40cdba97e1a54b96110b04a