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

Change-Id: I02e75f26ecb89ae5f95ce685d85faf6b23db6d64