Add proper ownership

Test: None
Change-Id: I9ab136e13dc7e9582b81d9b45ad5eb62ecc862f4
48 files changed