Merge "Add owners to the Shell app"
am: bc12083aa7

Change-Id: I699d79ab2106354ac2435c2c231faddfa1ff6239