Sync with Sony RIL

Change-Id: I13a91576f1302c74ad46d6c494ffaba033aa86de