LeoLaskin: updating with jleybay's comments from r16426.
LeoLaskin: updating with jleybay's comments from r16426.

r16459

rafael-chavez/java-client,saikrishna321/java-client,SrinivasanTarget/java-client,appium/java-client,SrinivasanTarget/java-client,rafael-chavez/java-client,TikhomirovSergey/java-client,YOU-i-Labs/appium-java-client,appium/java-client,rafael-chavez/java-client,saikrishna321/java-client,YOU-i-Labs/appium-java-client,TikhomirovSergey/java-client,saikrishna321/java-client,TikhomirovSergey/java-client,saikrishna321/java-client,SrinivasanTarget/java-client,SrinivasanTarget/java-client,YOU-i-Labs/appium-java-client,TikhomirovSergey/java-client,YOU-i-Labs/appium-java-client,rafael-chavez/java-client