Merge "Unable to input PIN with hardware keyboard"
am: b8740842e0

Change-Id: Ia295f2f9f12738ef944a775c2149b4e3f3ded9d4