Merge "Don't crash when passing null to requestChildFocus" into oc-dev
am: df50b64860

Change-Id: I77afb7ee544c08cdc927b0b2e66aa3f229a72892