Merge finger lock fix and quality improvements from upstream am: 4939a509c7 am: eebf20cd61

Original change: undetermined

Change-Id: I5c0c22c82afc39cd74a993a084779a9508aa502e
Signed-off-by: Automerger Merge Worker <[email protected]>