Merge "Remove unnecessary requestFocus" into nyc-mr1-dev
am: c6533190a6

Change-Id: I4e39f78ec09ece84336e85ae3386c291bafe9e1f