Merge "Fix plot crash in UltraSound test." into pie-cts-dev
am: ebf1d83c0f

Change-Id: I26baca7e52f2dc5e7233b998d4aff11c52d73037