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

Change-Id: Ib1f211a823098a6d7264da4839393b16e3c98aa0