Squashed RIL class update

Change-Id: Ib9c8366aedf8ba6d51a04073a803c411efb48e23