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

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