am bd2c034e: am c984699a: DO NOT MERGE Add missing features of JB and JB MR1

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