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

Change-Id: I818afc8d73bc0f987ab549a29300cc07b1ef1b89