Merge "Update OWNERS based on Trusty team membership"
am: 9495cda53b

Change-Id: I44f1540f1bd89a85f1d58e3fddf291fa310a870b