Merge "Fix wrong log and import order in PhoneInterfaceManager" am: c41da93a4a am: f78c740f01
am: a908704f78

Change-Id: Idd22f08d622bf04d40f4334760f9c1f5848ae28a