Small fixes on SSR model and in code formatting.

Change-Id: Ifb17e64aaca40f2081131684e2628a70d49d9cf9
5 files changed