Merge \\"ChooserActivity: Cannot start app that the icon overflows the layout\\" into nyc-mr1-dev am: 586f23c14b
am: 8b059e8aa1

Change-Id: I13f36de289f0990967e4e5fc967ea64ecfbc0ab8