Merge "Update to 7.58.0 - January 24 2018." am: 0c6d81f80b am: 95f668fdba
am: 279fa5e283

Change-Id: Ia93ddb50ee0c699a1e283b7094d895ff7bc2d6be