Fix guard

Change-Id: Idec944ca36401dcba0a71f52b38abd7ca1f2f60c
Auto sms

Change-Id: I94e16bf947991f2e125e18398657c53a296b14bd