Merge "Connectivity: Fix format arguments" am: ba8ab362ad
am: 2a13286d8d

Change-Id: I7517abe404637f92d7e361033d2d609b981f05f4