am 4026a797: (-s ours) am 14ccf554: Merge "DO NOT MERGE. Fix number picker accessibility focus." into jb-mr2-dev

* commit '4026a797bcc37c600dcb4cd229ef17b7d3bb0711':
  DO NOT MERGE. Fix number picker accessibility focus.