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

Change-Id: I46790dac54b210ce74e5ac4040ef7033850e7df5