am 2223d9fc: (-s ours) am bd2c034e: am c984699a: DO NOT MERGE Add missing features of JB and JB MR1

# Via Android Git Automerger (2) and Brian Muramatsu (1)
* commit '2223d9fca5a739df1e5d6a02d4d8e353479edd44':
  DO NOT MERGE Add missing features of JB and JB MR1