Merge "Fixing concurrency issue on IccPhoneBookInterfaceManager."