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

Change-Id: I4805c68c9d3ad609754631890f076a2ba2d2bb6c