Merge "Change owner" am: 528e9bdc2a

Change-Id: I7bd59b6d9ee201f47192994ecb60ff4b8253fa79