Merge "Set focus to the button" am: adc84e8f3d am: d066f138dc
am: 777f151592

Change-Id: Iec26d46071ad23b3efc64426462e9ee36d74e89b