Merge "Fix check for existence of parent" into nyc-mr1-dev
am: ea85e28488

Change-Id: I7919a5049588f3cbccc95443e0a72f83cce3f102