DO NOT MERGE JAPAN(440,441): 110,118,119,112,911

Bug: 8227305
Change-Id: I5b083035e92c5e805f86d3eca650136f0ce2b3c6
Merge "DO NOT MERGE JAPAN(440,441): 110,118,119,112,911" into jb-mr1