Merge "Don't use algorithm parameters if missing salt or iteration count." am: 9fd196fcf0
am: dc3758ea55

Change-Id: Ib9a75057baff0bb923131b03e559f95feecaecff