Followon to address minor formatting issues from [1]. This is purely aesthetic, no functional changes. [1] I4974a28de541aace043504f788cf0d100f778cae Change-Id: I3e8698c2a6dc753c484fd93e57707fe05c31af0a