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

Change-Id: I5af8df77455e01d90e3d358afc2d9f39269572ab