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

Change-Id: I77d9b5f458de39741d84e7ec0582397d0159c458