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

Change-Id: Id9a3a8ec1462c0a42025757fcb2cfd281d21a416