Merge "Replace is-board-platform[-in-list] with is-board-platform[-in-list]2"