This addresses style warnings introduced in 0cf4d9f1 Change-Id: I864ab5397024ee1db7b44307e5320c370e1d50ad