Merge with I9195XXUCNJ4

Change-Id: I75391d28fc00c8c0d8d0637b7e2d4744ffd75414