Merge "Avoid binder calls when unlocking" into pi-dev am: 664956a5a2
am: 160674fe8f

Change-Id: Ice6ceae8c32a2bb0d8fb0a74dc053f82762e7c22