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

Change-Id: Ic4864c9c7f0dca262dc7bdeb225228017797f1e7