Merge "Fix isValidParent check" into honeycomb-mr1