Merge "Update to lock task features API" into pi-dev
am: 3a5dabbb10

Change-Id: Ie8a12a29bfca101d19d8ec104988633b7749bb5f