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

Change-Id: Idf5c1cbcc4d7ef22a99289bf8aebeedfb301e53a