dd363a182f
Minor changes to give more consistent output; no functional changes to tests. Change-Id: I6c4ef74587c59b786761735c7bd528f3d7f94905