Merge "Clean up N6 shamu section"