Merge "Add platform changes to support new RIL APIs."