Merge "Revert "Make synthetic password enabled by default""