Fix style issues found in review of Fix for Bug 18558

Change-Id: Ib3cf4b5fdf8b6a8428101325e5a3a04271cd0f47