Merge "Fix duplicate entries in ChooserActivity" into nyc-mr1-dev am: b548ae5d5f
am: 07d3b17449

Change-Id: I181d8883983d0279e975f9e15724daf91ad9e84b