Merge "Add missing TAG definition TAG_UNLOCKED_DEVICE_REQUIRED" am: 2b4d64806c am: e7f05c6fb9
am: 1d336a9fcc

Change-Id: I915d71124dbbb4d444cd458f7aeb658e1fc336ea