Merge "Merge "Polling on hasFocus() for requestFocus() success" into pie-cts-dev am: aa269e4704"
am: 7c634cb4ac

Change-Id: I0f809fa7733e215e697a94834e60dbbc8597fd5f