Merge "Simplify board-info for 4.0.4"