Adjust restricted lock positions as per new design.

Bug: 27263531
Change-Id: I7e38a9e3356ca43ed936de1e6f8190eba4d4773e
7 files changed