am bd4d81b0: am b248077a: am 2eac005b: Merge "Fix bugs introduced in ChooserActivity" into mnc-dr-dev * commit 'bd4d81b0': Fix bugs introduced in ChooserActivity