Merge "Fix issues for Japan model. am: c1e9656422 am: 4597fcc545 am: d1a977b771 am: 6e8a31191a am: dc8403be7a am: 4961b292ac am: 413cad430a" into rvc-qpr-dev-plus-aosp