Merge ""Unlocked device required" javadoc clarification" into pi-dev