Merge "Add invalid id check to isValidParent" into honeycomb-mr1