Merge "Add HTC One E8"