Merge "new password shouldn't be empty string" am: dd7bd6b15a
am: bfb61ed2ed

Change-Id: I97c536fc0aaaec4e317944564519a908a762e9f5