Rebase serrano-common ril patch

Change-Id: I4697e0f1654f120ecf6943d93e656178289330e7