Merge "morello: Add changes to fix build of Morello Platform" into integration