Cleanup

Change-Id: I3e16c21a0e98d31b43814572e2bf05f21779f9fb
NI1: Fingerprint

Change-Id: If0842f624ab0406827a2f542f44a0841098602f4
[1/2] RIL v9

Change-Id: Iaac0bb433d842e012c7a8ad43c643b3ac0084575