Merge "Enable "Unlocked device required" API" into pi-dev am: 1e0a9b0b1b
am: 58731c1483

Change-Id: Ie0b2d1454b77b1e21d341aca492ec25e3a46252f