Merge "Allow the avatar shape to be configured" into pi-car-dev
am: 749262aca4

Change-Id: I112947dd7ec8186a53cd9f44cfe1896637508806