am 7d9cf2b7: am 8d21b881: am 6d32f4e8: am 64aa66d1: am b861a945: am 4cb43d97: Merge "lists.js files for gms and gcm" into jb-mr1-dev

# By Robert Ly
# Via Android Git Automerger (5) and others
* commit '7d9cf2b74236953671d20f5634f3b4234c25c6fa':
  lists.js files for gms and gcm