Merge "Quick style fixup of ISmsImplBase" am: 6a5c1492d2 am: a36d57b722
am: 8873784d07

Change-Id: Ib8fec2073dbd8d85248f2debb36740ba0783904c