Merge "Enable boost-locked-region-priority" into nyc-dev
am: 430894d1bb

* commit '430894d1bbac3ceb94dc2f57334858178fa53e97':
  Enable boost-locked-region-priority

Change-Id: I26257eae8b8d0dfdf604c2e8e7350ff415d8433f