am 2271385a: am bd4d81b0: am b248077a: am 2eac005b: Merge "Fix bugs introduced in ChooserActivity" into mnc-dr-dev

* commit '2271385ad8845d86af2a3aba6b03ec3113e9b9be':
  Fix bugs introduced in ChooserActivity