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

Change-Id: I4ccfecaa7f8b8a2102a5d285ee9848e4fb105a13