Merge "Handle leading/trailing space in passwords" into honeycomb