Adjust owner info to spec

Bug: 18249205
Change-Id: I71916b977d7567d4bc998b86f0d7748ae73a5de0
3 files changed