Merge "Remove try/catch of UnsupportedOperationException"