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

Change-Id: I219b1d9246f4845e0d0100fd1490b3e2155caf32