Merge "Revert accidental change of isUsingUnifiedPassword javadoc" into pi-dev am: bf8137a7cd
am: 6a6e20a432

Change-Id: I56677f1eac63fa2c9f97870808c2afd47c6da9a2