Re-add mango

Change-Id: I07cf59c447b7228d88d8b0bbf52f43f04e42c4f8