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

Change-Id: I70a684025690e59d728375f0753e037e25592167