am 42bde9e9: am c36a280e: Merge "DO NOT MERGE JAPAN(440,441): 110,118,119,112,911" into jb-mr1.1-dev

* commit '42bde9e93a776acf20d0df6d05b289120da31a54':
  DO NOT MERGE JAPAN(440,441): 110,118,119,112,911