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 (2) and others
* commit '64aa66d126b2c382ccbcc50e8690e75175074168':
  lists.js files for gms and gcm