merge 8960 ril

Change-Id: I928602b5c7b320537e056ee6a8f26efb6584ad31