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

Change-Id: I7d6a8e541308aba1ca67381f1a0fc070d627938f