22d629211d
More style fixes too, and removal of yet another lingering SH reference! Change-Id: Iebc34a46475dd11845ad172b9108bb6ddd7585bb