Merge "Add owners to the Shell app" am: bc12083aa7 am: 924f4e352d
am: 8947d38c39

Change-Id: I7723a2b64d4811bcabbc48c8cbfbe9513a10bd07