Merge "FocusRequester: fix NPE" am: c7ed3e7e22
am: a1ee32071b

Change-Id: I59c311de7cd861748b6d2522440a6fae762ecce7