This breaks style guidelines but for some reason git diff gets so lost on this re-indent that it's better to do it like this Change-Id: Ie0a603eb0739704894a5adc25f9d527b37bdf151