Minor formatting and other fixes. #14428

Change-Id: Iec10efedcb16abd3a99f3b7edeeccd907d25fb44