Merge "Switch SelectionBuilder to accept Object[], fix NPE."