Merge "Telephony module will staticlly link IState.java" am: 46e185031a am: 1215c5e690

Change-Id: Ia95db7d97ff15a77eebaa496b1af0d5113fe937a