Merge ""Unlocked device required" javadoc clarification" into pi-dev
am: 084f9aee9a

Change-Id: Icb6580e3c7ee5a1b5cbacbd99eb769e3f55b5d9a