Merge "Adjust restricted lock positions as per new design." into nyc-dev am: 1749d518b7
am: ace7191046

* commit 'ace7191046ccd4f51cdbdd72000898f67f50e3a4':
  Adjust restricted lock positions as per new design.